renamed data base and entity

fixed bug on mapping the entity to the model