Variable names changes to follow conventions