You are right, Sir!
The Concept is still Between national Capital and State Capital. Yet, where ever needed or where State Capital is not that sufficient, the state end has been changed.
2957/58 does not touch Gandhinagar (the Capital) but is terminated at / originated from Ahmedabad. Also not all the state Capitals are to have terminating Rajdhani like Jaipur (Rajasthan) and Bhopal (MP).
Thanks!