Directory Rename

Changed some names that should be changed.