Remove bedrock_ prefix on non-library (exported) objects
Conform typedefs