Removed getName() in favor of key/value pair