fixed incomplete naming cleanup