Added constant type
Guides fixes

Removed deprecated, fixed namings for new