fixed class naming conflicts