Fixed bug introduced by 1acd9dc49a1544b7e68ba4f133f34abc629006f4, implemented additional naming unit test