went through some of the types, started changing Entity and Type files