Better naming consistency in source files, rthrnorm bug fix