fixed up minor errors due to naming