mass naming scheme change. removed examples for now.