Minor renaming and added test