Fix install-dir to not use Impl entity suffix

- Adds EntityType.getSimpleName
- Use entity.getEntityType().getSimpleName(), rather than doing entity.getClass().getSimpleName()