mostly name changes to get things to work...