Clean Up 3

renames and other various things related to naming convention