Fixing first naming issues