TAMAYA-19: Code cleanup - renamed annot to mapping