re-factoring some of identifiers