renameing
Code refactorings based on DDD best practices