Safer extension replacement, methods rename