Fixed mapping issue with short oracle names