Modname refactoring.

Signed-off-by: Jerome Maloberti <jmaloberti@gmail.com>