Fixed names and unneeded key for publishing