Switched to new naming convention
Fix monoticity transformation
Fix tests