Minor change in functions name, norm