Fixed variables to follow PL CamelCase standard