Renamed theme and apps with underscores.