Minor improvements and renamings.