EMPIREDB-362 Interface cleanup (4) Some renaming
10 files changed