Modifying naming to be more generic, so that classes can hold multiple solutions