Made method name changes requested by @mkremins.