Fix NDArray signature
NDArray generic type arguments
remove NDArray type arguments
renames