Cleanup and improvements
Change some names