We introduce new first-order languages for the elementary n-dimensional geometry and elementary n-dimensional affine geometry , based on extending equation image and equation image, respectively, with new function symbols. Here, β stands for the betweenness relation and ≡ for the congruence relation. We show that the associated theories admit effective quantifier elimination.