Both are actually same. But when it is pursued with a particular purpose or objective, it is called penance (tapas). The effort one puts in to uplift oneself is called meditation (dhyana). Meditation means trying to understand the Self (atma).