fixed function names to be compatible with postgis 2.0