add comment about error
renamed packages to reflect our new domian
merge name changes