Fixed a naming issue,
fixed so the package path to a command/query can be used (bug introduced in one of the last few commits)