Some cosmetic changes (renaming, ...)