Updated entity names.
Removed first line which is obviously not common standard.
First stable migration. (hopefully)
Merge branch 'migration'