Updated to style naming conventions