Remove random names for entities

Little refactoring to make code presentable