Fixed some entities not being named.