Bug fixes; name changes