Fixing some more naming