Updated decorated method names as suggested by Jim