Naming improved in ffb9c81 (dev)