MOAR CodePro fixes

Lots of final replacements... and others

Author: Shockolate