Minor bugs arising from inconsistent names fixed