Changed how types were being added in decorations to be consistent and correct. (currently not using the '.entry.' suffix.)