Fixed some entity types

Ready to add naming