ORACLE1 is in the right order.
It's correct about SERVICE_NAME and SID_NAME, those methods are not compatible.
If you want to use SERVICE_NAME, you have to put it in the listener too.
The easy way is changing everything to SID_NAME