diff --git a/pom.xml b/pom.xml
index 12c6358182d89b335ffb996a129f8956ec12550e..053c91ffecbd7f360b9b5e88e1ab6a05eb80bb51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,7 +515,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>file-repository-ftpserver</artifactId>
-			<version>0.9</version>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
diff --git a/src/main/java/org/genesys2/server/service/impl/FilesMetadataUpdate.java b/src/main/java/org/genesys2/server/service/impl/FilesMetadataUpdate.java
index 5a4330334351240330921bd03f809b5af37a1c74..0a36bf8d96b36b018e5e94263dc6145d2112b4bc 100644
--- a/src/main/java/org/genesys2/server/service/impl/FilesMetadataUpdate.java
+++ b/src/main/java/org/genesys2/server/service/impl/FilesMetadataUpdate.java
@@ -73,7 +73,7 @@ public class FilesMetadataUpdate extends ImportFromCSV<RepositoryFile> {
 
 		RepositoryFile updatedFile = null;
 		try {
-			updatedFile = repositoryService.updateMetadata(sourceFile.getUuid(), sourceFile);
+			updatedFile = repositoryService.updateMetadata(sourceFile);
 		} catch (NoSuchRepositoryFileException e) {
 			LOG.error("Can not find RepositoryFile with uuid:{}", sourceFile.getUuid());
 		}
diff --git a/src/main/java/org/genesys2/server/service/impl/InstituteFilesServiceImpl.java b/src/main/java/org/genesys2/server/service/impl/InstituteFilesServiceImpl.java
index 574b4a63fd575860dd49127b94a45d62b81d456c..a923764b32882c91d3c76b5ee278617f0f0fd329 100644
--- a/src/main/java/org/genesys2/server/service/impl/InstituteFilesServiceImpl.java
+++ b/src/main/java/org/genesys2/server/service/impl/InstituteFilesServiceImpl.java
@@ -123,7 +123,9 @@ public class InstituteFilesServiceImpl implements InstituteFilesService {
 			LOG.warn("{}!={}", repositoryFile.getPath(), getGalleryPath(institute, accession));
 			throw new ResourceNotFoundException("No such thing");
 		}
-		return this.repositoryService.updateImageMetadata(repositoryFile.getUuid(), imageData);
+		imageData.setUuid(repositoryFile.getUuid());
+		imageData.setVersion(repositoryFile.getVersion());
+		return this.repositoryService.updateImageMetadata(imageData);
 	}
 
 	@Override
diff --git a/src/main/java/org/genesys2/server/servlet/controller/WiewsController.java b/src/main/java/org/genesys2/server/servlet/controller/WiewsController.java
index 3d4928126ac52a21b25137c3138933c3df9e71e8..9c4948bf3d1c889cc0771fa8d555a6a6f0990fb5 100644
--- a/src/main/java/org/genesys2/server/servlet/controller/WiewsController.java
+++ b/src/main/java/org/genesys2/server/servlet/controller/WiewsController.java
@@ -609,8 +609,7 @@ public class WiewsController extends BaseController {
 		// check user permissions
 		instituteService.getInstituteForEdit(wiewsCode);
 
-		RepositoryFile updatedFile = repositoryService.getFile(UUID.fromString(fileData.getUuid().toString()));
-		repositoryService.updateMetadata(updatedFile.getUuid(), fileData);
+		RepositoryFile updatedFile = repositoryService.updateMetadata(fileData);
 		String fileSubPath = updatedFile.getPath().replace("/wiews/" + wiewsCode, "");
 
 		return "redirect:/wiews/" + wiewsCode + "/files" + fileSubPath;
diff --git a/src/main/java/org/genesys2/server/servlet/controller/admin/RepositoryController.java b/src/main/java/org/genesys2/server/servlet/controller/admin/RepositoryController.java
index 4ae0b71c9d79c991d22d0179ce8cd0499c2ce043..7dd58289a276956f3537e8acc13a5147397bb116 100644
--- a/src/main/java/org/genesys2/server/servlet/controller/admin/RepositoryController.java
+++ b/src/main/java/org/genesys2/server/servlet/controller/admin/RepositoryController.java
@@ -125,9 +125,7 @@ public class RepositoryController extends BaseController {
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public String updateMetadata(@ModelAttribute RepositoryFile fileData, @RequestParam String uuid, RedirectAttributes redirectAttributes)
 			throws NoSuchRepositoryFileException {
-		RepositoryFile updatedFile = repositoryService.getFile(UUID.fromString(uuid));
-		
-		updatedFile = repositoryService.updateMetadata(updatedFile.getUuid(), fileData);
+		RepositoryFile updatedFile = repositoryService.updateMetadata(fileData);
 
 		return "redirect:" + CONTROLLER_PATH + "/files" + updatedFile.getPath();
 	}
diff --git a/src/main/resources/liquibase.properties b/src/main/resources/liquibase.properties
index 473c92709c6bf5105194e37169c8f392e76cd5a4..22ec1b6133bfcae6654e84be287e70b3150c7ae6 100644
--- a/src/main/resources/liquibase.properties
+++ b/src/main/resources/liquibase.properties
@@ -9,13 +9,14 @@ changeLogFile=src/main/resources/liquibase/liquibase-changeLog.yml
 
 # Uncomment for mvn liquibase:diff
 diffChangeLogFile=src/main/resources/liquibase/liquibase-diff-changeLog.yml
+## &hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy
 # Existing database
-url=jdbc:mysql://localhost/genesysold?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false&hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy
+url=jdbc:mysql://localhost/genesysold?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
 username=root
 password=
 driver=com.mysql.jdbc.Driver
 # Upgraded database
-referenceUrl=jdbc:mysql://localhost/genesys?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false&hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy
+referenceUrl=jdbc:mysql://localhost/genesys?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
 referenceDriver=com.mysql.jdbc.Driver
 referenceUsername=root
 referencePassword=
diff --git a/src/main/resources/liquibase/liquibase-changeLog.yml b/src/main/resources/liquibase/liquibase-changeLog.yml
index 1f27536b42014e85484e48aa1ee4c7d6edeeda04..378226370d7678a90498931ad716710f258b2157 100644
--- a/src/main/resources/liquibase/liquibase-changeLog.yml
+++ b/src/main/resources/liquibase/liquibase-changeLog.yml
@@ -2306,3 +2306,24 @@ databaseChangeLog:
         onUpdate:              NO ACTION
         referencedColumnNames: id
         referencedTableName:   subset
+
+- changeSet:
+    id: 1531941193570-18
+    author: mobreza (generated)
+    comment: Changes for file-repository@1.0-SNAPSHOT
+    changes:
+    - renameTable:
+        newTableName:    repository_document
+        oldTableName:    repositorydocument
+    - renameTable:
+        newTableName:    repository_file
+        oldTableName:    repositoryfile
+    - renameTable:
+        newTableName:    repository_gallery
+        oldTableName:    repositorygallery
+    - renameTable:
+        newTableName:    repository_gallery_image
+        oldTableName:    repositorygalleryimage
+    - renameTable:
+        newTableName:    repository_image
+        oldTableName:    repositoryimage