Fixed names and versions