Improve consistency.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
Add and rename conversion methods for consistency.

Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>