Rename command class and config class