Changing to C-style names - commands
Changing to C-style names - main
Changing to C-style names - subsystems merging with others