Fixing names

Signed-off-by: shyeon.kim <shyeon.kim@scipi.net>
Adding several enhancements

Signed-off-by: shyeon.kim <shyeon.kim@scipi.net>