More Entities work

- cleanup some naming
- fix old scripts