namespace conflict

Edited filenames to fix namespace conflict bug