Update JavaDoc and generic signature name choices