Namefile fixes and new namefiles