Const naming change...