conformed to standards, better names