Regex entries removal supplemented + minor renamings.