diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ac31f85..08a977ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#241](https://github.com/shlinkio/shlink/issues/241) Fixed columns in `visit_locations` table, to be snake_case instead of camelCase.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
 
 ## 1.13.2 - 2018-10-18
 
diff --git a/build.sh b/build.sh
index 8cf290e3..ea502d69 100755
--- a/build.sh
+++ b/build.sh
@@ -18,6 +18,7 @@ rm -rf "${builtcontent}"
 mkdir -p "${builtcontent}"
 rsync -av * "${builtcontent}" \
     --exclude=data/infra \
+    --exclude=data/migrations_template.txt \
     --exclude=**/.gitignore \
     --exclude=CHANGELOG.md \
     --exclude=composer.lock \
diff --git a/data/migrations/Version20181020060559.php b/data/migrations/Version20181020060559.php
new file mode 100644
index 00000000..0e2c862d
--- /dev/null
+++ b/data/migrations/Version20181020060559.php
@@ -0,0 +1,68 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20181020060559 extends AbstractMigration
+{
+    private const COLUMNS = [
+        'countryCode' => 'country_code',
+        'countryName' => 'country_name',
+        'regionName' => 'region_name',
+        'cityName' => 'city_name',
+    ];
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $this->createColumns($schema->getTable('visit_locations'), self::COLUMNS);
+    }
+
+    private function createColumns(Table $visitLocations, array $columnNames): void
+    {
+        foreach ($columnNames as $name) {
+            if (! $visitLocations->hasColumn($name)) {
+                $visitLocations->addColumn($name, Type::STRING, ['notnull' => false]);
+            }
+        }
+    }
+
+    /**
+     * @throws SchemaException
+     * @throws DBALException
+     */
+    public function postUp(Schema $schema): void
+    {
+        $visitLocations = $schema->getTable('visit_locations');
+
+        // If the camel case columns do not exist, do nothing
+        if (! $visitLocations->hasColumn('countryCode')) {
+            return;
+        }
+
+        $qb = $this->connection->createQueryBuilder();
+        $qb->update('visit_locations');
+        foreach (self::COLUMNS as $camelCaseName => $snakeCaseName) {
+            $qb->set($snakeCaseName, $camelCaseName);
+        }
+        $qb->execute();
+    }
+
+    public function down(Schema $schema): void
+    {
+        // No down
+    }
+}
diff --git a/data/migrations/Version20181020065148.php b/data/migrations/Version20181020065148.php
new file mode 100644
index 00000000..432dded8
--- /dev/null
+++ b/data/migrations/Version20181020065148.php
@@ -0,0 +1,40 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20181020065148 extends AbstractMigration
+{
+    private const CAMEL_CASE_COLUMNS = [
+        'countryCode',
+        'countryName',
+        'regionName',
+        'cityName',
+    ];
+
+    /**
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $visitLocations = $schema->getTable('visit_locations');
+
+        foreach (self::CAMEL_CASE_COLUMNS as $name) {
+            if ($visitLocations->hasColumn($name)) {
+                $visitLocations->dropColumn($name);
+            }
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        // No down
+    }
+}
diff --git a/data/migrations_template.txt b/data/migrations_template.txt
new file mode 100644
index 00000000..41c4a8c8
--- /dev/null
+++ b/data/migrations_template.txt
@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+
+namespace <namespace>;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version<version> extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+<up>
+    }
+
+    public function down(Schema $schema): void
+    {
+<down>
+    }
+}
diff --git a/migrations.yml b/migrations.yml
index e732a0dc..db3a57b3 100644
--- a/migrations.yml
+++ b/migrations.yml
@@ -2,3 +2,4 @@ name: ShlinkMigrations
 migrations_namespace: ShlinkMigrations
 table_name: migrations
 migrations_directory: data/migrations
+custom_template: data/migrations_template.txt
diff --git a/module/Core/src/Entity/VisitLocation.php b/module/Core/src/Entity/VisitLocation.php
index f00a5db6..af75b8d6 100644
--- a/module/Core/src/Entity/VisitLocation.php
+++ b/module/Core/src/Entity/VisitLocation.php
@@ -19,37 +19,37 @@ class VisitLocation extends AbstractEntity implements ArraySerializableInterface
 {
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="country_code")
      */
     private $countryCode;
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="country_name")
      */
     private $countryName;
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="region_name")
      */
     private $regionName;
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="city_name")
      */
     private $cityName;
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="latitude")
      */
     private $latitude;
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="longitude")
      */
     private $longitude;
     /**
      * @var string
-     * @ORM\Column(nullable=true)
+     * @ORM\Column(nullable=true, name="timezone")
      */
     private $timezone;