fixed merge errors and improper renamings