Fixing some small naming issues