Correct use of dwcFP and add dwcFP prefix