applied patch
implement the renames
fix tests