fixed: refined version of name processing