Fixed names in main listing