1) remove prefix for new variables and redundant parts

Status Job ID Name Coverage
  External
passed jenkins