misc renaming better naming conventions etc