rename classes to reduce conflicts