replacing naming everywhere + some simplification