Merge "Remove the rename() interceptor"