Refactor and rename transform classes