re-facoring ui commands to new identifiers style