Fix bug with naming, add deprecated flag