Fixes some problems

o Also renames the conversion helper
Merge branch 'master' of github.com:cpfaff/rtematres