Merge "Replace 'javascript' method/parameternames"