Added tests for naming
Fixed bug with custom naming