renaming, removing domain specific style