More consistent naming and extracted transformation method