name stubs more appropriately