changed getdeclarationsanddefintions to getusrlocations with parameter
added "rename" to the getUsrLocations types, simple test