Include relationship and change scope names