1.1 wip

updated a couple class names to reflect the new naming structure in foundation 4