Fixed naming; internal stuff moved to _internal.h