finished refactor rnaming device to estate and all vestiges