Added rm_ prefixes to functions lacking them