Remove and rename a few bits n pieces