Methods rename - changed from camel case to using underscores