Bounds for operations and naming scheme altered