Re-worked entities to work for the user interface name space.