Updated nameing for android core project