Minor fixes and renaming, getting it ready for nimzo DEV.