changed names to match PHP style