fixed naming conventions in 22-2
fixups