Constants name changed

New arguments logic