Removed TODO from entities.classes.  Some of the externals do work, but the normal names make more sense to use than the externals.  So, using the external names was removed.