Changes to taxonomy class

Updated to have the taxonomy names as class constants for reuse in
templates.