Rename and touch ups on entities mirroring

Last bit of work we see on the horizon is the connector code and the 5cp
logic