unified naming convention; dependency check done - improver compile times