Fixing class conflict name