rename class for refixing ZK-1729