Merge "Remove "Jpa" from table name"