Fixed naming + nits