Adding subsystem hint, renaming some internal commands to keep things tidy