Some renaming + added test for issue 2343