Cleaned up in lwgjl and changed name