Renamed and moved constants

Renamed and moved constants, see changelog