Class name refactor, remove unneccesary elementValueArray