Remame class to avoid conflicts