Fixed naming
Updates and fix error