Minor renaming fix from sloppy copy/replace
Minor fixes