Bugfix for Command Names