Absorbed pull request with command rename and cleaned up some of the includes