fixed comments referring to obsolete API
changed how container is named by default