Minor namechanges and cleaning up