made naming scheme more straightforward