Naming in sync w/ haxe version