cec: and rename them in the methods that use them too...