More rename and additional constants