Remove logic from provision and rename.

Remove logic from provision and rename.