I would maintain the bean name "dataSource" rather than explicitly changing to "lazyConnectionDataSourceProxy" everywhere. It's really an implementation detail that the DataSource being used happens to be a proxy that enables the lazy (late-as-possible) connection.