Fixing some naming snafus