Preparing GUIs

Renamed GUIs for merging