use same prefixes for all properties and bug fix regarding order cancelation