Code cleaning: Remove noisy naming