Another method/property renaming, I think I got it right this time.