Rename to _prefixKeypath + cleanup