Made necessary renaming to match the tested project