Updates naming of dynamic type and cleans out silly code