Fix ambigous naming