method rename and message changes