changed to proper name convention