tweaks to class naming and converted to americanised