Fix method naming to p6 norms.