Fixed a bug with commanded and naming convensions